bitkeeper revision 1.1305 (42603ffeunTyoZX2egpGvfR_Km2tBw)

[PATCH] Install libraries into libdir

Attached makes it so that libxc and libxutil get installed
into /usr/lib64 instead of /usr/lib on x86_64.

Signed-off-by: Jeremy Katz <katzj@redhat.com>
===== Config.mk 1.3 vs edited =====

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index a0cec812e65d15fc845e959467906a06fa47e9f2..adabcee7f0ce103061b1d6832adb2828ffec0d31 100644 (file)
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -52,6 +52,7 @@ kaf24@plym.cl.cam.ac.uk
 kaf24@scramble.cl.cam.ac.uk
 kaf24@striker.cl.cam.ac.uk
 kaf24@viper.(none)
+katzj@redhat.com
 kmacy@shemp.lab.netapp.com
 laudney@eclipse.(none)
 leendert@watson.ibm.com

diff --git a/Config.mk b/Config.mk
index 2db6c644fe504c64223467182463276b9afee5c7..802f499f76e189e9f16b74f1aae6195ca1d298c0 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -24,9 +24,15 @@ STRIP      = $(CROSS_COMPILE)strip
 OBJCOPY    = $(CROSS_COMPILE)objcopy
 OBJDUMP    = $(CROSS_COMPILE)objdump
 
+ifeq ($(XEN_TARGET_ARCH),x86_64)
+LIBDIR = lib64
+else
+LIBDIR = lib
+endif
+
 ifneq ($(EXTRA_PREFIX),)
 EXTRA_INCLUDES += $(EXTRA_PREFIX)/include
-EXTRA_LIB += $(EXTRA_PREFIX)/lib
+EXTRA_LIB += $(EXTRA_PREFIX)/$(LIBDIR)
 endif
 
 LDFLAGS += $(foreach i, $(EXTRA_LIB), -L$(i)) 

diff --git a/Makefile b/Makefile
index 403321912c1b996a53e619b8678951a90a02c395..f2ec2bc6948ecca1ca6400d2dcf71544df2acdc4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -163,7 +163,7 @@ uninstall: D=$(DESTDIR)
 uninstall:
        [ ! -d $(D)/etc/xen ] || mv -f $(D)/etc/xen $(D)/etc/xen.old
        rm -rf $(D)/etc/init.d/xend*
-       rm -rf $(D)/usr/lib/libxc* $(D)/usr/lib/libxutil*
+       rm -rf $(D)/usr/$(LIBDIR)/libxc* $(D)/usr/$(LIBDIR)/libxutil*
        rm -rf $(D)/usr/lib/python/xen $(D)/usr/include/xen
        rm -rf $(D)/usr/include/xcs_proto.h $(D)/usr/include/xc.h
        rm -rf $(D)/usr/sbin/xcs $(D)/usr/sbin/xcsdump $(D)/usr/sbin/xen*

diff --git a/tools/Rules.mk b/tools/Rules.mk
index e6171ad399f05e980c58234a508ef75f6bf5b1e4..6e811b9611d0d1e7542b80e56dc023e841dec35f 100644 (file)
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -9,15 +9,15 @@ XEN_LIBXUTIL       = $(XEN_ROOT)/tools/libxutil
 ifeq ($(XEN_TARGET_ARCH),x86_32)
 CFLAGS  += -m32 -march=i686
 LDFLAGS += -m elf_i386
-X11_LDPATH = -L/usr/X11R6/lib
 endif
 
 ifeq ($(XEN_TARGET_ARCH),x86_64)
 CFLAGS  += -m64
 LDFLAGS += -m elf_x86_64
-X11_LDPATH = -L/usr/X11R6/lib64
 endif
 
+X11_LDPATH = -L/usr/X11R6/$(LIBDIR)
+
 %.opic: %.c
        $(CC) $(CPPFLAGS) -DPIC $(CFLAGS) -fPIC -c -o $@ $<
 

diff --git a/tools/blktap/Makefile b/tools/blktap/Makefile
index 3478552ac424a323cee7ccc899ac867ffce7e98b..9d794301c3ad830c3d1586e2c2b325541215954c 100644 (file)
--- a/tools/blktap/Makefile
+++ b/tools/blktap/Makefile
@@ -73,9 +73,9 @@ mk-symlinks:
          ln -sf ../../$(LINUX_ROOT)/include/asm-xen/linux-public/*.h . )
 
 install: all
-       $(INSTALL_DIR) -p $(DESTDIR)/usr/lib
+       $(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)
        $(INSTALL_DIR) -p $(DESTDIR)/usr/include
-       $(INSTALL_PROG) $(LIB) $(DESTDIR)/usr/lib
+       $(INSTALL_PROG) $(LIB) $(DESTDIR)/usr/$(LIBDIR)
        $(INSTALL_PROG) blktaplib.h $(DESTDIR)/usr/include
        $(INSTALL_PROG) blkdump blkcow blkimg blkcowimg blkgnbd blkcowgnbd $(DESTDIR)/$(BLKTAP_INSTALL_DIR)
 

diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index fecb4bfa5811c3b10fb3585421ebdfbf0e37268f..eea521875431cf321d820cf61d3c2923ea354b1c 100644 (file)
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -69,12 +69,12 @@ mk-symlinks:
          ln -sf ../../$(LINUX_ROOT)/include/asm-xen/linux-public/*.h . )
 
 install: build
-       [ -d $(DESTDIR)/usr/lib ] || $(INSTALL_DIR) $(DESTDIR)/usr/lib
+       [ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
        [ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
-       $(INSTALL_PROG) libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib
-       $(INSTALL_DATA) libxc.a $(DESTDIR)/usr/lib
-       ln -sf libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib/libxc.so.$(MAJOR)
-       ln -sf libxc.so.$(MAJOR) $(DESTDIR)/usr/lib/libxc.so
+       $(INSTALL_PROG) libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
+       $(INSTALL_DATA) libxc.a $(DESTDIR)/usr/$(LIBDIR)
+       ln -sf libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxc.so.$(MAJOR)
+       ln -sf libxc.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxc.so
        $(INSTALL_DATA) xc.h $(DESTDIR)/usr/include
 
 .PHONY: TAGS clean rpm install all

diff --git a/tools/libxutil/Makefile b/tools/libxutil/Makefile
index 90a83223cf740371f111ff0d658ed06d9b2fcfb7..1a3ed9b109dcb1ddf26c192bba4dd2e71242f88f 100644 (file)
--- a/tools/libxutil/Makefile
+++ b/tools/libxutil/Makefile
@@ -63,11 +63,11 @@ check-for-zlib:
        fi
 
 install: build
-       [ -d $(DESTDIR)/usr/lib ] || $(INSTALL_DIR) -p $(DESTDIR)/usr/lib
-       $(INSTALL_PROG) libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib
-       $(INSTALL_DATA) libxutil.a $(DESTDIR)/usr/lib
-       ln -sf libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib/libxutil.so.$(MAJOR)
-       ln -sf libxutil.so.$(MAJOR) $(DESTDIR)/usr/lib/libxutil.so
+       [ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)
+       $(INSTALL_PROG) libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
+       $(INSTALL_DATA) libxutil.a $(DESTDIR)/usr/$(LIBDIR)
+       ln -sf libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxutil.so.$(MAJOR)
+       ln -sf libxutil.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxutil.so
 
 clean:
        $(RM) *.a *.so* *.o *.opic *.rpm